home *** CD-ROM | disk | FTP | other *** search
/ X User Tools / X User Tools (O'Reilly and Associates)(1994).ISO / sources / ical / rtr / ical1 < prev   
Text File  |  1994-10-02  |  2KB  |  89 lines
  1. --- ./Makefile.in.orig    Sat Jan  1 14:41:48 1994
  2. +++ ./Makefile.in    Fri Sep 23 13:51:59 1994
  3. @@ -6,11 +6,11 @@
  4.  
  5.  # The prefix/exec_prefix variables have to start at the beginning of the line.
  6.  
  7. -prefix = /usr/local
  8. +prefix = <installdir>
  9.  exec_prefix = $(prefix)
  10.  
  11.         BINDIR = $(exec_prefix)/bin
  12. -       LIBDIR = $(prefix)/lib
  13. +       LIBDIR = <installsharedir>/slib/X11
  14.         MANDIR = <installsharedir>/man
  15.  
  16.            CCC = @CCC@
  17. @@ -40,9 +40,9 @@
  18.         XINC = @xinc@
  19.         XLIB = @xlib@
  20.       TCLINC = @tclinc@
  21. -     TCLLIB = @tcllib@ -ltcl
  22. +     TCLLIB = -L/usr/local/xutlib -ltcl
  23.        TKINC = @tkinc@
  24. -      TKLIB = @tklib@ -ltk
  25. +      TKLIB = -L/usr/local/xutlib -ltk
  26.    EXTRALIBS = @LIBS@
  27.  
  28.         LIB1 = calendar/libcalendar.a
  29. @@ -111,13 +111,20 @@
  30.  
  31.  # Installation rules
  32.  
  33. -install: instbin instlib instman
  34. +ULIBDIR = <installdir>/lib/X11
  35. +
  36. +install: instbin instlib1 instlib instman
  37.  
  38.  instbin: ical
  39.      -$(MKDIR) $(BINDIR)
  40.      $(INSTALL) ical $(BINDIR)/ical
  41.      $(INSTALL) calshell $(BINDIR)/calshell
  42.      $(INSTALL) calshellx $(BINDIR)/calshellx
  43. +
  44. +instlib1:
  45. +    -$(MKDIR) $(ULIBDIR)
  46. +    -$(MKDIR) $(ULIBDIR)/ical
  47. +    -$(INSTALL_DATA) startup.tcl $(ULIBDIR)/ical
  48.  
  49.  instlib:
  50.      -$(MKDIR) $(LIBDIR)
  51. --- ./configure.orig    Thu Nov  4 11:57:42 1993
  52. +++ ./configure    Fri Sep 23 13:29:15 1994
  53. @@ -779,7 +779,7 @@
  54.    if test -z "$prefix"; then
  55.      dirs="/usr/local/include /usr/include"
  56.    else
  57. -    dirs="$prefix/include /usr/local/include /usr/include"
  58. +    dirs="$prefix/include /usr/local/share/xutinclude /usr/local/include /usr/include"
  59.    fi
  60.    for d in $dirs; do
  61.      if test -f "$d/tcl.h"; then
  62. @@ -812,7 +812,7 @@
  63.    if test -z "$prefix"; then
  64.      dirs="/usr/local/include /usr/include"
  65.    else
  66. -    dirs="$prefix/include /usr/local/include /usr/include"
  67. +    dirs="$prefix/include /usr/local/share/xutinclude /usr/local/include /usr/include"
  68.    fi
  69.    for d in $dirs; do
  70.      if test -f "$d/tk.h"; then
  71. @@ -851,7 +851,7 @@
  72.  
  73.  # Set default prefixes.
  74.  if test -n "$prefix"; then
  75. -  test -z "$exec_prefix" && exec_prefix='${prefix}'
  76. +  test -z "$exec_prefix" && exec_prefix=<installdir>
  77.    prsub="s%^prefix\\([     ]*\\)=\\([     ]*\\).*$%prefix\\1=\\2$prefix%"
  78.  fi
  79.  if test -n "$exec_prefix"; then
  80. @@ -907,7 +907,7 @@
  81.  LIBS='$LIBS'
  82.  srcdir='$srcdir'
  83.  prefix='$prefix'
  84. -exec_prefix='$exec_prefix'
  85. +exec_prefix=<installdir>
  86.  prsub='$prsub'
  87.  extrasub='$extrasub'
  88.  EOF
  89.